From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 4 May 2001 20:16:56 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~40468
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=7824fba6ab62ad34004010ba62a305bd6ae8be2b;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a77f19c9ace..cc31f973ab4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,12 @@
 2001-05-04  Stefan Monnier  <monnier@cs.yale.edu>
 
+	* progmodes/cperl-mode.el (cperl-font-lock-keywords)
+	(cperl-font-lock-keywords-1, cperl-font-lock-keywords-2):
+	Renamed from perl-font-lock-keywords to avoid clashes.
+	(cperl-mode, cperl-load-font-lock-keywords, cperl-init-faces)
+	(cperl-load-font-lock-keywords-1, cperl-load-font-lock-keywords-2):
+	Updated correspondingly.
+
 	* diff-mode.el (diff-nonexistent-face, diff-font-lock-keywords):
 	Typo `nonexistant' -> `nonexistent'.